Conflict Resolution in Model Versioning
نویسندگان
چکیده
Optimistic version control systems enable globally distributed teams of developers to work together asynchronously. Every developer works on a local copy and consequently, no developer is ever detracted from working by waiting for a resource. The price for this flexibility is payed at the moment when conflicting modifications must be integrated into one consolidated version. In this paper, we discuss conflicts and their need for resolution in the context of model versioning and provide the basic concepts necessary to build a model versioning system which guides modelers through the critical consolidation phase by recommending suitable patterns.
منابع مشابه
AMOR – Towards Adaptable Model Versioning
The development of complex software systems requires appropriate abstraction mechanisms in terms of model-driven engineering techniques (MDE) and proper support for allowing developers to work in parallel in terms of version control systems (VCSs). For realizing the vision of MDE, a bundle of standards has been made available recently, whereas the versioning of models has not gained the necessa...
متن کاملMining of Model Repositories for Decision Support in Model Versioning
State-of-the-art software repositories support optimistic versioning and hence the concurrent editing of one artifact by multiple developers is possible. The drawback of this method is the time-consuming, manual merge process when conflicting changes occur. This is a bigger problem when the artifacts are models. Although similar kinds of conflicts frequently reoccur, current systems hardly prov...
متن کاملThe Role of Cultural Intelligence and Conflict Resolution in Predicting Sports Success of Iranian Paralympic Athletes: Presenting a Structural Equation Model
Background and Aim: The Paralympic Games are a major international multi-sport event for athletes with physical disabilities or intellectual impairments. The current study develops a model of the effect of cultural intelligence on conflict resolution and the success of Iranian Paralympic athletes. Methods: This is a descriptive correlational study. Participants in this study were 124 athletes w...
متن کاملLV*: A low complexity lazy versioning HTM infrastructure
Transactional memory (TM) promises to unlock parallelism in software in a safer and easier way than lock-based approaches but the path to deployment is unclear for several reasons. First of all, since TM has not been deployed in any machine yet, experience of using it is limited. While software transactional memory implementations exist, they are too slow to provide useful experience. Existing ...
متن کاملWe can work it out: Collaborative Conflict Resolution in Model Versioning
For the versioning of code a pantheon of version control system (VCS) solutions has been realized and is successfully applied in practice. Nevertheless, when it comes to merging two different versions of one artifact, the resolution of conflicts poses a major challenge. In standard systems, the developer who performs the later commit is sole in charge of this often time-consuming, error-prone t...
متن کامل